Revert my last mistaken change - toggle-size-request doesn't take a

Tue Dec  4 11:06:54 2001  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmenuitem.c: Revert my last mistaken change -
        toggle-size-request doesn't take a requisition.

        * gtk/gtkmenuitem.c (gtk_menu_item_class_init): Fix
        reference to marshaler that no longer exists.

diff --git a/ChangeLog b/ChangeLog
index e6ec98c655cf5e6a2dcc92deffe3f8e43b5ea1ef..f89a9cb214d237cd0104cf641b115317e2b9e5a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Dec  4 11:06:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c: Revert my last mistaken change - 
+       toggle-size-request doesn't take a requisition.
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_class_init): Fix
+       reference to marshaler that no longer exists.
+
 Mon Dec  3 16:39:17 2001  Owen Taylor  <otaylor@redhat.com>
 
        Patch from Bill Haneman (with many modifications) to make

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e6ec98c655cf5e6a2dcc92deffe3f8e43b5ea1ef..f89a9cb214d237cd0104cf641b115317e2b9e5a8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Tue Dec  4 11:06:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c: Revert my last mistaken change - 
+       toggle-size-request doesn't take a requisition.
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_class_init): Fix
+       reference to marshaler that no longer exists.
+
 Mon Dec  3 16:39:17 2001  Owen Taylor  <otaylor@redhat.com>
 
        Patch from Bill Haneman (with many modifications) to make

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e6ec98c655cf5e6a2dcc92deffe3f8e43b5ea1ef..f89a9cb214d237cd0104cf641b115317e2b9e5a8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Dec  4 11:06:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c: Revert my last mistaken change - 
+       toggle-size-request doesn't take a requisition.
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_class_init): Fix
+       reference to marshaler that no longer exists.
+
 Mon Dec  3 16:39:17 2001  Owen Taylor  <otaylor@redhat.com>
 
        Patch from Bill Haneman (with many modifications) to make

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e6ec98c655cf5e6a2dcc92deffe3f8e43b5ea1ef..f89a9cb214d237cd0104cf641b115317e2b9e5a8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Tue Dec  4 11:06:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c: Revert my last mistaken change - 
+       toggle-size-request doesn't take a requisition.
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_class_init): Fix
+       reference to marshaler that no longer exists.
+
 Mon Dec  3 16:39:17 2001  Owen Taylor  <otaylor@redhat.com>
 
        Patch from Bill Haneman (with many modifications) to make

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e6ec98c655cf5e6a2dcc92deffe3f8e43b5ea1ef..f89a9cb214d237cd0104cf641b115317e2b9e5a8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Dec  4 11:06:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c: Revert my last mistaken change - 
+       toggle-size-request doesn't take a requisition.
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_class_init): Fix
+       reference to marshaler that no longer exists.
+
 Mon Dec  3 16:39:17 2001  Owen Taylor  <otaylor@redhat.com>
 
        Patch from Bill Haneman (with many modifications) to make

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e6ec98c655cf5e6a2dcc92deffe3f8e43b5ea1ef..f89a9cb214d237cd0104cf641b115317e2b9e5a8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Dec  4 11:06:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c: Revert my last mistaken change - 
+       toggle-size-request doesn't take a requisition.
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_class_init): Fix
+       reference to marshaler that no longer exists.
+
 Mon Dec  3 16:39:17 2001  Owen Taylor  <otaylor@redhat.com>
 
        Patch from Bill Haneman (with many modifications) to make

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e6ec98c655cf5e6a2dcc92deffe3f8e43b5ea1ef..f89a9cb214d237cd0104cf641b115317e2b9e5a8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Dec  4 11:06:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c: Revert my last mistaken change - 
+       toggle-size-request doesn't take a requisition.
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_class_init): Fix
+       reference to marshaler that no longer exists.
+
 Mon Dec  3 16:39:17 2001  Owen Taylor  <otaylor@redhat.com>
 
        Patch from Bill Haneman (with many modifications) to make

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 89024764102c40ae256449596f907e689d9371e0..e26fb1b485b7b12f5b0e9d9413e8093958fed891 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -186,9 +186,9 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkMenuItemClass, toggle_size_request),
-                    _gtk_marshal_VOID__BOXED,
+                    _gtk_marshal_VOID__POINTER,
                    GTK_TYPE_NONE, 1,
-                   GTK_TYPE_REQUISITION);
+                   GTK_TYPE_POINTER);
 
   menu_item_signals[TOGGLE_SIZE_ALLOCATE] =
     gtk_signal_new ("toggle_size_allocate",